(smerge-command-prefix): Fix custom type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97ec7dc1cf72fe39c9c21af72b5412e3872ca0c7..82c5ca42f02832fa1d7a477029aef218e09b2175 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-10  Reiner Steib  <reiner.steib@gmx.de>
+
+       * smerge-mode.el (smerge-command-prefix): Fix custom type.
+
 2008-05-05  Carsten Dominik  <dominik@science.uva.nl>
 
        * textmodes/org.el (org-read-date-get-relative): Interpret lone

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 9ef2dade0e0000ffaa454a0d1f700c61e77a88fb..451b96a261bc90af3ac145c948e9d426633d4d1b 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -155,7 +155,10 @@ Used in `smerge-diff-base-mine' and related functions."
 (defcustom smerge-command-prefix "\C-c^"
   "Prefix for `smerge-mode' commands."
   :group 'smerge
-  :type '(choice (string "\e") (string "\C-c^") (string "") string))
+  :type '(choice (const :tag "ESC"   "\e")
+                (const :tag "C-c ^" "\C-c^" )
+                (const :tag "none"  "")
+                string))
 
 (easy-mmode-defmap smerge-mode-map
   `((,smerge-command-prefix . ,smerge-basic-map))